Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Sep 2011 04:02:53 +0000 (21:02 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Sep 2011 04:02:53 +0000 (21:02 -0700)

Trivial merge